Regenerate deps. Rename snprintf for WIN32.

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index d7ed7c67de514e185564fa64c559787c0841e2cf..fbec91b506687ccf69eeb607f3c601857581a8dd 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -78,7 +78,7 @@ VERSIOND=1.2.1
 release:
        ./chkdoc
        rm -fr gpsbabel-$(VERSIOND)
-       cvs tag gpsbabel_$(VERSIONU)
+       cvs tag -F gpsbabel_$(VERSIONU)
        cvs export -r gpsbabel_$(VERSIONU) -d gpsbabel-$(VERSIOND) gpsbabel
        tar czf /tmp/gpsbabel-$(VERSIOND).tar.gz gpsbabel-$(VERSIOND)
        cd /tmp ; tar xzf gpsbabel-$(VERSIOND).tar.gz
@@ -104,6 +104,7 @@ garmin.o: garmin.c defs.h queue.h jeeps/gps.h jeeps/gpsport.h \
   garmin_tables.h
 gcdb.o: gcdb.c defs.h queue.h coldsync/palm.h coldsync/pdb.h
 geo.o: geo.c defs.h queue.h
+geoniche.o: geoniche.c defs.h queue.h coldsync/palm.h coldsync/pdb.h
 gpilots.o: gpilots.c defs.h queue.h coldsync/palm.h coldsync/pdb.h
 gpspilot.o: gpspilot.c defs.h queue.h coldsync/palm.h coldsync/pdb.h
 gpsutil.o: gpsutil.c defs.h queue.h magellan.h
@@ -128,7 +129,7 @@ quovadis.o: quovadis.c quovadis.h defs.h queue.h coldsync/palm.h \
   coldsync/pdb.h
 route.o: route.c defs.h queue.h
 saroute.o: saroute.c defs.h queue.h
-smplrout.o: smplrout.c defs.h grtcirc.h
+smplrout.o: smplrout.c defs.h queue.h grtcirc.h
 tiger.o: tiger.c defs.h queue.h csv_util.h
 tmpro.o: tmpro.c defs.h queue.h csv_util.h
 tpg.o: tpg.c defs.h queue.h jeeps/gpsmath.h jeeps/gps.h jeeps/gpsport.h \

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 0a32f8255bca0fc7cd219401749a197d96058c58..2b5ee3c6af989e52f062fd7eec6f15b30ea59b0f 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -33,6 +33,15 @@
 #  define M_PI 3.14159265358979323846
 #endif
 
+/*
+ * Snprintf is in SUS (so it's in most UNIX-like substance) and it's in 
+ * C99 (albeit with slightly different semantics) but it isn't in C89.   
+ * This tweaks allows us to use snprintf on the holdout.
+ */
+#if __WIN32__
+#  define snprintf _snprintf
+#endif
+
 /*
  * Common definitions.   There should be no protocol or file-specific
  * data in this file.